git.neil.brown.name Git - wiggle.git/shortlog

]> git.neil.brown.name Git - wiggle.git/shortlog

2013-08-23	NeilBrown	Release wiggle v1.0 v1.0	commit \| commitdiff \| tree \| snapshot
2013-08-23	NeilBrown	Add 'dovtest'.	commit \| commitdiff \| tree \| snapshot
2013-08-23	NeilBrown	Browser: avoid unused-variable error from valgrind.	commit \| commitdiff \| tree \| snapshot
2013-08-23	NeilBrown	Browser: refine 'c' and 'x' commands.	commit \| commitdiff \| tree \| snapshot
2013-08-23	NeilBrown	Browser: remove some more infinite loops.	commit \| commitdiff \| tree \| snapshot
2013-08-23	NeilBrown	Man page updates.	commit \| commitdiff \| tree \| snapshot
2013-08-23	NeilBrown	Hack to improve view of ignore-blank conflicts.	commit \| commitdiff \| tree \| snapshot
2013-08-23	NeilBrown	Browser: avoid possible infinite loop.	commit \| commitdiff \| tree \| snapshot
2013-08-23	NeilBrown	Browser: discard VTRACE code.	commit \| commitdiff \| tree \| snapshot
2013-08-23	NeilBrown	Browser: disable ignore-blanks after editing.	commit \| commitdiff \| tree \| snapshot
2013-08-23	NeilBrown	Browser: base tempfile name on that of original file.	commit \| commitdiff \| tree \| snapshot
2013-08-23	NeilBrown	Browser: delete temporary file after reading it back in.	commit \| commitdiff \| tree \| snapshot
2013-08-22	NeilBrown	Update copyright claims.	commit \| commitdiff \| tree \| snapshot
2013-08-22	NeilBrown	man page: mention lack of Unicode support	commit \| commitdiff \| tree \| snapshot
2013-08-22	NeilBrown	man page: update instructions for git usage.	commit \| commitdiff \| tree \| snapshot
2013-08-22	NeilBrown	man page: Quote some more hyphen.	commit \| commitdiff \| tree \| snapshot
2013-08-22	NeilBrown	Add --output option to redirect output.	commit \| commitdiff \| tree \| snapshot
2013-08-22	NeilBrown	Browser: if editing leaves no conflicts, display diff.	commit \| commitdiff \| tree \| snapshot
2013-08-22	NeilBrown	Browser: pass line number to editor when editting the...	commit \| commitdiff \| tree \| snapshot
2013-08-22	NeilBrown	Browser: edit merge in a temporary file.	commit \| commitdiff \| tree \| snapshot
2013-08-21	NeilBrown	Browser -- support page-up and page-down	commit \| commitdiff \| tree \| snapshot
2013-08-21	NeilBrown	Allow diffs to be browsed.	commit \| commitdiff \| tree \| snapshot
2013-08-21	NeilBrown	Browser: add 'v' to open file in an editor.	commit \| commitdiff \| tree \| snapshot
2013-08-21	NeilBrown	Remove stray file.	commit \| commitdiff \| tree \| snapshot
2013-08-21	NeilBrown	manpage: add notes about how to integrate with git.	commit \| commitdiff \| tree \| snapshot
2013-08-21	NeilBrown	Add --report-wiggles option	commit \| commitdiff \| tree \| snapshot
2013-08-21	NeilBrown	Browser: update all of status line in one place.	commit \| commitdiff \| tree \| snapshot
2013-08-21	NeilBrown	Preserve per-hunk "comment" field.	commit \| commitdiff \| tree \| snapshot
2013-08-21	NeilBrown	vpatch: simplify display of editted mergers.	commit \| commitdiff \| tree \| snapshot
2013-08-20	NeilBrown	Browser: add 'c' command to accept a conflict.	commit \| commitdiff \| tree \| snapshot
2013-08-20	NeilBrown	Make some fatal errors more helpful.	commit \| commitdiff \| tree \| snapshot
2013-08-20	NeilBrown	Browse: make sure 'X' doesn't loop forever searching...	commit \| commitdiff \| tree \| snapshot
2013-08-20	NeilBrown	Allow interactive setting of "--ignore-blanks" flag.	commit \| commitdiff \| tree \| snapshot
2013-08-20	NeilBrown	Browse: suppress "last-key" debugging.	commit \| commitdiff \| tree \| snapshot
2013-08-20	NeilBrown	Browse: allow "--replace" to be requested while viewing.	commit \| commitdiff \| tree \| snapshot
2013-08-20	NeilBrown	Browser: highlight spaces at the end of a line.	commit \| commitdiff \| tree \| snapshot
2013-08-19	NeilBrown	Add some test after the markers in a merge.	commit \| commitdiff \| tree \| snapshot
2013-08-19	NeilBrown	merge: fix another bug in isolate_conflicts.	commit \| commitdiff \| tree \| snapshot
2013-08-19	NeilBrown	vpatch: discard 'ignored' for 'oldtype'.	commit \| commitdiff \| tree \| snapshot
2013-08-19	NeilBrown	merge: fix reporting of empty "conflicts".	commit \| commitdiff \| tree \| snapshot
2013-08-19	NeilBrown	tests: new test case for stray &&&&&	commit \| commitdiff \| tree \| snapshot
2013-08-19	NeilBrown	Browser: Don't highlight spaces so much.	commit \| commitdiff \| tree \| snapshot
2013-08-19	NeilBrown	Unwrap some printf string.	commit \| commitdiff \| tree \| snapshot
2013-08-19	NeilBrown	Browser help: add some missing commas.	commit \| commitdiff \| tree \| snapshot
2013-03-28	NeilBrown	Extract version information from 'git' if possible.	commit \| commitdiff \| tree \| snapshot
2013-03-22	NeilBrown	merge: be more careful about aligning hunk-headers...	commit \| commitdiff \| tree \| snapshot
2013-03-22	NeilBrown	csl_join should merge adjacent matches.	commit \| commitdiff \| tree \| snapshot
2013-03-08	NeilBrown	merge: calculate number of wiggles more accurately.	commit \| commitdiff \| tree \| snapshot
2013-03-08	NeilBrown	merge: tidy up isolation of conflicts.	commit \| commitdiff \| tree \| snapshot
2013-03-08	NeilBrown	vpatch: restore display for hunk header where appropriate.	commit \| commitdiff \| tree \| snapshot
2013-03-05	NeilBrown	Add --ignore-blanks option.	commit \| commitdiff \| tree \| snapshot
2013-03-01	NeilBrown	vpatch: allow a word to have text before the newline.	commit \| commitdiff \| tree \| snapshot
2013-03-01	NeilBrown	Allow a word to have an unmatched prefix and suffix.	commit \| commitdiff \| tree \| snapshot
2013-03-01	NeilBrown	discard ends_mline, just use ends_line	commit \| commitdiff \| tree \| snapshot
2013-03-01	NeilBrown	vpatch: restructure draw_mside.	commit \| commitdiff \| tree \| snapshot
2013-03-01	NeilBrown	Remove duplicate definition of "csl_join"	commit \| commitdiff \| tree \| snapshot
2013-03-01	NeilBrown	merge: Remove noise from --show-wiggles output.	commit \| commitdiff \| tree \| snapshot
2013-02-20	NeilBrown	vpatch: fix browse of three-file merge.	commit \| commitdiff \| tree \| snapshot
2013-02-19	NeilBrown	tests: add 'merge' test for linux/raid5	commit \| commitdiff \| tree \| snapshot
2013-02-14	NeilBrown	Add valgrind testing of parts of vpatch.	commit \| commitdiff \| tree \| snapshot
2013-02-14	NeilBrown	Add "make valgrind"	commit \| commitdiff \| tree \| snapshot
2013-02-14	NeilBrown	merge: remove some meaningless AlreadyApplied	commit \| commitdiff \| tree \| snapshot
2013-02-14	NeilBrown	bestmatch: improve poor matches.	commit \| commitdiff \| tree \| snapshot
2013-02-13	NeilBrown	merge: remove useless context from the end of a conflict.	commit \| commitdiff \| tree \| snapshot
2013-02-13	NeilBrown	merge: remove useless context at the start of a conflict.	commit \| commitdiff \| tree \| snapshot
2013-02-13	NeilBrown	vpatch: fix another access-beyond-array	commit \| commitdiff \| tree \| snapshot
2013-02-12	NeilBrown	vpatch: allow relevant signals to cause a core-dump.	commit \| commitdiff \| tree \| snapshot
2013-02-12	NeilBrown	vpatch: fix various reference errors found by valgrind.	commit \| commitdiff \| tree \| snapshot
2013-02-07	NeilBrown	Browser: add missing documentation for Save and Restore...	commit \| commitdiff \| tree \| snapshot
2013-02-06	NeilBrown	diff: make rediffing of patches more precise.	commit \| commitdiff \| tree \| snapshot
2013-02-04	NeilBrown	DOC: remove diff.ps due to distribution license issues.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: add mouse movement to merge_window.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: add mouse support for main window.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	Man page updates.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: allow control-C to disable --replace function.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: handle --replace option.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: add X command to ignore all changes in the...	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: make sure render is stable when the merge is...	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: allow changes to be ignored as well as conflict.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: fix display for ignored conflicts.	commit \| commitdiff \| tree \| snapshot
2012-11-15	NeilBrown	vpatch: add "control-X-O" as a watch to change panes.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: allow mode setting keys to toggle back to ...	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: change appearance of ignored conflicts.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: update status counters when we save a file.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: add 'C' command to go to next conflicted hunk.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: highlight conflicts better.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: update display correctly when editing the merge.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: conditionally auto-save unsaved files when...	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: avoid repeated backups.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: prompt to save change if merge was editted.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: allow a save file to be restored.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: support saving of files.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: Allow a message to be displayed in main folder.	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	Separate make_merger out from print_merge2	commit \| commitdiff \| tree \| snapshot
2012-11-14	NeilBrown	vpatch: remove lots of memory leaks.	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: allow a file in list to be a 'merger' instead...	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: allow conflict to be ignored with 'x'	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: change args to visible()	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: avoid extra blanks when cursor is in alternate...	commit \| commitdiff \| tree \| snapshot
2012-11-13	NeilBrown	vpatch: add 'space' and 'backspace' for page up/down.	commit \| commitdiff \| tree \| snapshot
next

apply rejected patches and perform word-wise diffs

RSS Atom